Use the GNOME 3 WM theme by default

Set up an override to specify the metacity window decoration
theme.  Use the GNOME 3 standard theme as the default.

diff --git a/data/gnome-shell.schemas b/data/gnome-shell.schemas
index 5798a3edb4daa13d14c986362bfbb59001f4107e..1a887118aca606f1def776fe94633721c68e22b7 100644 (file)
--- a/data/gnome-shell.schemas
+++ b/data/gnome-shell.schemas
@@ -62,5 +62,23 @@
         </locale>
       </schema>
 
+      <schema>
+        <key>/schemas/desktop/gnome/shell/windows/theme</key>
+        <applyto>/desktop/gnome/shell/windows/theme</applyto>
+        <owner>gnome-shell</owner>
+        <type>string</type>
+        <default>Adwaita</default>
+        <locale name="C">
+          <short>Current theme</short>
+          <long>
+            The theme determines the appearance of window borders,
+            titlebar, and so forth.
+
+            This key overrides /apps/metacity/general/theme when
+            running GNOME Shell.
+          </long>
+        </locale>
+      </schema>
+
   </schemalist>
 </gconfschemafile>

diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c
index f672778408b9656f246ac84a958214ebcf870470..0a3959df424df3ff098f0a0e28042d2226022fde 100644 (file)
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -161,6 +161,8 @@ gnome_shell_plugin_init (GnomeShellPlugin *shell_plugin)
                                            "/desktop/gnome/shell/windows/button_layout");
   meta_prefs_override_preference_location ("/apps/metacity/general/side_by_side_tiling",
                                            "/desktop/gnome/shell/windows/side_by_side_tiling");
+  meta_prefs_override_preference_location ("/apps/metacity/general/theme",
+                                           "/desktop/gnome/shell/windows/theme");
 }
 
 static void